diff --git a/system/libraries/Typography.php b/system/libraries/Typography.php
index 11b3917..1ae4577 100644
--- a/system/libraries/Typography.php
+++ b/system/libraries/Typography.php
@@ -267,23 +267,23 @@
 							// on which direction to curl, with non-word characters like punctuation
 							// being a secondary factor only after whitespace is addressed.
 							'/\'"(\s|$)/'					=> '&#8217;&#8221;$1',
-							'/(^|\s)\'"/'					=> '$1&#8216;&#8220;',
+							'/(^|\s|<p>)\'"/'				=> '$1&#8216;&#8220;',
 							'/\'"(\W)/'						=> '&#8217;&#8221;$1',
 							'/(\W)\'"/'						=> '$1&#8216;&#8220;',
 							'/"\'(\s|$)/'					=> '&#8221;&#8217;$1',
-							'/(^|\s)"\'/'					=> '$1&#8220;&#8216;',
+							'/(^|\s|<p>)"\'/'				=> '$1&#8220;&#8216;',
 							'/"\'(\W)/'						=> '&#8221;&#8217;$1',
 							'/(\W)"\'/'						=> '$1&#8220;&#8216;',
 
 							// single quote smart quotes
 							'/\'(\s|$)/'					=> '&#8217;$1',
-							'/(^|\s)\'/'					=> '$1&#8216;',
+							'/(^|\s|<p>)\'/'				=> '$1&#8216;',
 							'/\'(\W)/'						=> '&#8217;$1',
 							'/(\W)\'/'						=> '$1&#8216;',
 
 							// double quote smart quotes
 							'/"(\s|$)/'						=> '&#8221;$1',
-							'/(^|\s)"/'						=> '$1&#8220;',
+							'/(^|\s|<p>)"/'					=> '$1&#8220;',
 							'/"(\W)/'						=> '&#8221;$1',
 							'/(\W)"/'						=> '$1&#8220;',